From da117dcdca99fa8c5550316c7e4ced050d66de31 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 21 Jan 2002 16:50:45 +0000 Subject: [PATCH] Set the fallback program class here, rather than Mon Jan 21 11:46:39 2002 Owen Taylor * gdk/gdk.c (gdk_init_check): Set the fallback program class here, rather than lazilygdk_get_program_class(), since we don't want -name to override it. (#69123, Ryan Lovett) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk/gdk.c | 13 +++++++------ 8 files changed, 49 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 834307dd0a..8d15a4bd8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jan 21 11:46:39 2002 Owen Taylor + + * gdk/gdk.c (gdk_init_check): Set the fallback program class here, + rather than lazilygdk_get_program_class(), since we don't want + -name to override it. (#69123, Ryan Lovett) + Mon Jan 21 10:29:45 2002 Owen Taylor * gdk/gdk.c: Fix wrong types for command line arguments diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 834307dd0a..8d15a4bd8a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Mon Jan 21 11:46:39 2002 Owen Taylor + + * gdk/gdk.c (gdk_init_check): Set the fallback program class here, + rather than lazilygdk_get_program_class(), since we don't want + -name to override it. (#69123, Ryan Lovett) + Mon Jan 21 10:29:45 2002 Owen Taylor * gdk/gdk.c: Fix wrong types for command line arguments diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 834307dd0a..8d15a4bd8a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Jan 21 11:46:39 2002 Owen Taylor + + * gdk/gdk.c (gdk_init_check): Set the fallback program class here, + rather than lazilygdk_get_program_class(), since we don't want + -name to override it. (#69123, Ryan Lovett) + Mon Jan 21 10:29:45 2002 Owen Taylor * gdk/gdk.c: Fix wrong types for command line arguments diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 834307dd0a..8d15a4bd8a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Jan 21 11:46:39 2002 Owen Taylor + + * gdk/gdk.c (gdk_init_check): Set the fallback program class here, + rather than lazilygdk_get_program_class(), since we don't want + -name to override it. (#69123, Ryan Lovett) + Mon Jan 21 10:29:45 2002 Owen Taylor * gdk/gdk.c: Fix wrong types for command line arguments diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 834307dd0a..8d15a4bd8a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Jan 21 11:46:39 2002 Owen Taylor + + * gdk/gdk.c (gdk_init_check): Set the fallback program class here, + rather than lazilygdk_get_program_class(), since we don't want + -name to override it. (#69123, Ryan Lovett) + Mon Jan 21 10:29:45 2002 Owen Taylor * gdk/gdk.c: Fix wrong types for command line arguments diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 834307dd0a..8d15a4bd8a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Jan 21 11:46:39 2002 Owen Taylor + + * gdk/gdk.c (gdk_init_check): Set the fallback program class here, + rather than lazilygdk_get_program_class(), since we don't want + -name to override it. (#69123, Ryan Lovett) + Mon Jan 21 10:29:45 2002 Owen Taylor * gdk/gdk.c: Fix wrong types for command line arguments diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 834307dd0a..8d15a4bd8a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Jan 21 11:46:39 2002 Owen Taylor + + * gdk/gdk.c (gdk_init_check): Set the fallback program class here, + rather than lazilygdk_get_program_class(), since we don't want + -name to override it. (#69123, Ryan Lovett) + Mon Jan 21 10:29:45 2002 Owen Taylor * gdk/gdk.c: Fix wrong types for command line arguments diff --git a/gdk/gdk.c b/gdk/gdk.c index dce2ac063e..04020ebc75 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -295,6 +295,13 @@ gdk_init_check (int *argc, g_set_prgname (""); } + /* We set the fallback program class here, rather than lazily in + * gdk_get_program_class, since we don't want -name to override it. + */ + gdk_progclass = g_strdup (g_get_prgname ()); + if (gdk_progclass[0]) + gdk_progclass[0] = g_ascii_toupper (gdk_progclass[0]); + #ifdef G_ENABLE_DEBUG { gchar *debug_string = getenv("GDK_DEBUG"); @@ -456,12 +463,6 @@ gdk_threads_init () G_CONST_RETURN char * gdk_get_program_class (void) { - if (gdk_progclass == NULL) - { - gdk_progclass = g_strdup (g_get_prgname ()); - gdk_progclass[0] = g_ascii_toupper (gdk_progclass[0]); - } - return gdk_progclass; } -- 2.30.2